Fix #1 and update test file.