Keenan - More tests