small bug fix, updates to tests