Improved testing

Sorry for PR on master!