Refactor tests

[Finishes #43074645]
Fix account creation

[Finishes #43074573]