Add in unit tests