Small bugfixes and tests on stereotypes