Cleanup, standardization and structure updates for unit tests