Added MainTest. And other stuff.