Continue to work on getting full tests to pass