Added more advanced tests