MOAR Test!!! and a few logic fixes