Add Unit Tests, Fix Travis