#396 Split up tests