Mostly complete set of working tests