Fixed CI Integration, Added Unit Tests