Complete first draft for the testing suite