#10 separate version for imperium + tests cleanups