Preparation for adding assemble and disassamble methods in repositories.
Tests cleanup