Made changes to Makefile & lab_tb