Started fixing up Tests and Frameworks and aggregated them into their proper projects