Fixes and updates to test