Fix some minor infrastructure
Cleaned up testing