Fixed tests and removed sysouts. #161