Small changes; basic test setup