refactored a lot; cleaned up names
move testkits to test scope