Fixed tests and tp