Added some tests
added tests, got one test that continues to fail, dunno why