Add: bootstrapped the test suite