Added Tests

Changed all so that Code writes return Type correctly