Moved Simple Feature Swtich tests to own class
Added missing If from test name
Merge branch 'UpdateFemahTests'