More monkeying around with tests