Fixed testing errors and updated work-breakdown