Refactor tests
Use prototype pattern
Remove dependency