fixxed tests / fixxed html and removed ng-if for ng-model handling