unified integration tests
repackaged test class
fixed test