Fix Stopwatch tests
Fix View tests