test-related changes, and starting on exemplarish trainign