Changed some to just an alias to any, removed duplicate tests.