Fix missing include
Add launcher for tests
Fix test
Cleanup