Removed logic from ViewModels + created tests