Major revamp; Most tests passing
Fix last failing test
Don't print everything on Travis-CI