WIP: get unit tests working