ticket:13 Added tests