Updated. Added some changes after Unit Testing Boundaries