Bug fixing
Simplifying tests