Cleaned up spec stuff for Hana.