Starting work on getting these tests to pass