Reorganization, improved unit testing interface