Added More Units Tests