Refactored test components a bit.