ticket:33 Added additional tests