moving tests to respective files