Add tests that need to be fleshed out