Refurbished test suite
Removed some leftover files. Added more flexibility in stopping criterion choice