Added a bit more test