Minor updates to test implementation