Fixed an absent semicolon
Extended tests to cover filter and class together
Tidied up the tests a little
Merge pull request #1 from matthewbdaly/master

Extended unit tests