New tests fixed

Fixed #8, Fixed #3