fixed testing suite given changes