checkpoint (needs testing)
fixes unit tests