Tests

Made more tests pass.