Made tests go green!
Merge branch 'master' of github.com:mrdejong/themer
Deleted old test files