UPDATE #1

Made some tests