#96 Added tests