More options and a test