Added (error), (port?), some test cases