Revert split into seperate stage for testing

2 jobs for ci in 6 minutes and 32 seconds (queued for 7 minutes and 52 seconds)