Adding a bit better tests