Remove empty space spec
Modify tests to new validation filter
Little refactoring