WIP: small test udpates
WIP: small tweaks
WIP: removed test for defunct function