Reworking the Famous/Angular starter for testing