added more test and small fixes to []