Trying to get a working test suite (WIP)