Add tests for moving within scope and add method: move_within_scope

Addressed to #67 and #78

/cc @conzett