Added more advanced tests.