Reorganised tests. Scheme is more clear now.