chore(tests): Finish Controller unit tests fixes #97