Remove unecessary defaults vars and handler include in test