Fixed unit tests and implemented collections in local store