Fixed filtering special keys
Updated test
Whitespace