beef up specs for all known cases