Fixing bug with ngannotate and adding new test cases for next draft of development