Minor changes

Changes mainly to the test file. Adding tests from the instructions