Keenan - more tests