Remove dependency on genx
Add test suite