Changes and new tests