WIP, fixed all tests