resuming work with some new tests