Add test task.
Fix errors from removing underscores - refactor.