Initial checkin of more testing