Handle slow layer loading

TESTS RUNNING SLOW dont commit. Checking what Travis says