Completing feature f
Merge branch 'feature_f' into development
Adding test script
Merge branch 'test_script' into development
mergred & fixed commits