Simple testing and updated goals