Initial cleanup for testing
Working Karma test:unit