(run with `drone exec` or using drone CI)

Also fixes a bug and adds some methods to make classes more testable

And moved some utility methods around