Adding in unit tests