Test: Added new tests