Adding New Tests -- update based on code review comments.