Work on getting tests to pass