Tests, removed heavy dependencies