Rewrote container and implemented UnitTesting