Made basic test pass

Now all tests pass!