Ninjafix: Added test cases for #181