Focus tests and fixes
Add value tests