Added the test Files
Updated Tests and Classes