Added tests like in Java project