Fix elab
Add more tests
Add more tests