updated tests due to recent changes. WIP