separate tests & rename