got tests to work, too...