WIP - Fixed unit tests (cross fingers)