O tests

Please merge this branch with the master.