Changed some things in testing; forgot to revert them