some cleaning up of tests and prod-code