changed OQL over to a prototype format finally. modified tests to reflect