Make tests get picked up automatically. Handle errors better.