Vastly improve tests