Committed more changes to Completion Controller, all methods tested