Combine test to one file
Try to fix a failing test
minor
Make the test to pass