bug fix
add a bunch of tests
update _oasis