Clean up lastvalue tests a little