More testing, reverting of testing stuff too