Adding test for utilities
Refactoring renderer