Cleanup test suites a litlle bit (not functional yet...)