cleaned up error message, consolidated tests.