Separate tests out into a separate file