WIP fixed all tests