cleaned up naming for tests