Fixed dependency issue.
Fixed tests. Tests need to be built manually for now.