Remove unused
Add test runner