fixed 3 failing tests that caused the build to fail #657