Added simpler testing stuff