Add system tests