Making tests pass, should add more