Merged final project and testing code together