fixed null pointer exception and errors from before'S refactoring in test SHController