Added tests (not finished yet)