Fixed errors found through unit testing
fixed minor errors in unit tests
added travis badge back to README