Classified, added unit tests, travis