Issue #0
Tests + remove script tag refactoring