WIP: added a couple more tests and the set one fails