Added in new Layout Service unit tests