#26 Additional tests