Test theory

Clean up scoped or non-scoped methods