Fixed unit tests and constantize