fix last issues + use parameterized test