Improved unit test 2