Built a real test, and some more hacking