Tests passing, updates to specs