Simplify setup version handling
Add basic tests