Added test modes