oracle - fixed first and added more tests