adjusted to new dotCore and external projects; fixed unit-tests