Temporarily getting tests to pass