updated some tests to reflect changes made