Corrected tests
Added user's unit tests