[Issue #85] [WIP] fixes controller tests