Simplify testing with a testing framework, make registry work