Add extra tests
Add proper VERSION support and bump version