fixes syntax
Split SwaggerTest into multiple files + Partial fixes

Closes #171, #177 & #178