Fixed some of form B tests and additional test refactoring