ticket:9 rebuild + test