Add more tests in and fix frink.