Fixing some error, test running now