Adding ignores and fixed code to match tests