Added better tests and removed weak ones