Add tests (need fixing)