Merge branch '#336_improve_tests' into DONT_MERGE_ME_#336_temp