Added more specific keeper tests