Add more tests and fix filename inconsistency.