Started trying to get tests to pass