WIP (update tests) (NOT DONE)