compilation errors resolved, TODO unit tests