Update 4

Added UnitTesting