Updated Project Backlog (/w Mathew) and added some more unit tests