remove tests that don apply, update props