Got tests passing again. Put assets in separate folder.