Tests Added and Space handling added too