Fix: some test functions not called because of name reuse