Work on test.
Fixes.
Add js test.
Fix acceptance test.