refactors decorator tests and expands them to get total coverage