Added\Fixed tests, changed structure