Gutted old unit tests