Fixed testing suite