Fix Polymer test
Clean code