Oki check I'll refactor them into their own files. Was doubting at first and took the current approach because they are only a few extra tests. But you're right adding a few extra files won't hurt and does keep things simpler.