Fix tests
Update Oasis.js to master