Add some admin stuff
Remove obsolete tests