sort things out with tests