Build path changes

Hopefully nobody's Test project will break now