Updated: testing suite