Small bugfixes and tests on stereotypes
First round of test runs completed successfully