small updates and test setup