Fix tests in master, closes #11.