Added low-tech test mechanism