Feature/test fixes op

Small fixes for tests. All tests are passing locally now.