Add missing test case
Add missing test stubs
Add some error handling and reporting
Moved test to correct module