Removed invalid test, fixed wrong order on another
Removed redundant B() calls, removed outdated test