Improved test coverage

See above comments (1 expect per 'it' block)