Cleanup of modules done, starting unit testing