Remove artificial loading delay
Make all tests pass