some tests, some alterations