Fixes #406
Fixes #405
Merge pull request #407 from delving/issue406

Fixes #406 & #405
Merge branch 'master' into next-steps
LIDO unit test working with restructured LIDO 1.0.2