Moved AndResultSetTest to right package