updates and test setup