Improved couple unit tests