Made the test a bit more functional???