Rework, test classes