Update inc tests and refactor