Fixed few issues in tests