Split tests into more files.
And given consistent naming scheme