refactored test subjects