Add in former unit tests