fab test and small updates