Fix tests, add "make test"