BackendTest updated
Backend refactoring and bug fix