cleanup
Skip() story test
fix encoder