refactor: fixes, improvements and test coverage#6

dieppa merged 9 commits intodevelopflamingock/flamingock-java-template-sql:developfrom

analysis-fixesflamingock/flamingock-java-template-sql:analysis-fixesCopy head branch name to clipboard