Refactored tests - make them faster.