#21 Small changes for tests