More testing and hacking