Updated for new layer methods, tests