updates to get tests working