Silenced the default messages in setup() and teardown()
Updated todos
Moved test files to test dir