modified certain files and added certain tests to suite