Refactored unit tests; added widget component