Add more tests (up to level-2 expression).
Restore package naming.
Fixes some more bugs.