refactored Structure Unit Test, and Behaviors