Introduced unit tests