Added Tests and updaed few tests