Blueprints implimented, tests upgraded