added some/none handling tests