Project Progress Update

Bugfixes and improvements for test procedures.