First few tests in place and passing