update tests
refactor old pastes, help controllers