Switched testing to Test:Simple, added more tests