Fixed tests, renamed main package