reorganize MyAccount form
tests: clean up and speed up by removing duplicated test data