Added tests

Not yet running...