Unit tests continued