Merged tests, moved TestingCanvas into vispy.testing