added the tests , removed unwanted stuff