Fixed failing tests (due to not including source files)