Working tests with workaround