Updated test up to, added FAQ