#5 extended tests, fixed problems