Updated testing process inspired by @Kdyby