Add and clean unit tests