Remove empty test directory
Remove trailing whitespace
Add context filtering
Remove some trailing spaces