Fixed signals and added tests
Fixed align data and added test cases