- tests splitted into two test suites
- minor test fix