Unit tests #61