Tests added + writer changed