Tests, readme, and SimpleRouter as well as code cleaning