Move (and rework) existing layout calculation specs
Removed unneeded method inside Layout. Earmarked some tests to be updated later that were just testing internal implementation.