style(tests): cleanup
fix(chore): remove 2px hack, fix #6
fix conflict