Further unit testing
Removed some references to deleted files