updated ignore, added missing test cases, reformatted