got rid of two tests that were not applicableanymore