Added test and run classes