Updated solution to include test projects