Merge tests as no classloader issue solution has been found yet.