Test refactoring
Added better test output