WIP
Added a test
OASIS regen + .gitignore