Reverted tests back to original and incorporated suggestions.