Fixed tests for account metadata changes