Adjust nf_p2.story and implement tests
Merge branch 'master' of https://github.com/nadvamir/GU-PSD3-Team-M