Added tests for FirstOrValue and SingleOrValue