Clean up and moar tests

- Cleaned up the end of startup
- Trying out versioning. again