Fix classification
Actually perform tests
Merge branch 'feature/kickass_documentation' of github.com:YeoLab/flotilla into dev