Add more manual testing