Added more adhoc tests