WIP starting to implement tests