P tests improved and accuracy fixed