Break into multiple test methods
More testing and bug fixing